]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
thunderbolt: sync D-Bus API with bolt changes
authorChristian Kellner <christian@kellner.me>
Thu, 19 Apr 2018 12:22:04 +0000 (14:22 +0200)
committerChristian Kellner <christian@kellner.me>
Fri, 20 Apr 2018 09:36:37 +0000 (11:36 +0200)
bolt 0.3 deprecated all AUTHORIZED_XXX status flags, but added
a CONNECTING one. Also AuthFlags got renamed to AuthCtrl.

js/ui/status/thunderbolt.js

index f3236f21c09abc207a0fe60a45b7ac1978af1b29..98e81dbf330f0437abb8fbc6b8d701ac6973dcd0 100644 (file)
@@ -56,12 +56,11 @@ const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface);
 
 var Status = {
     DISCONNECTED: 'disconnected',
+    CONNECTING: 'connecting',
     CONNECTED: 'connected',
     AUTHORIZING: 'authorizing',
     AUTH_ERROR: 'auth-error',
-    AUTHORIZED: 'authorized',
-    AUTHORIZED_SECURE: 'authorized-secure',
-    AUTHORIZED_NEWKEY: 'authorized-newkey'
+    AUTHORIZED: 'authorized'
 };
 
 var Policy = {
@@ -70,7 +69,7 @@ var Policy = {
     AUTO: 'auto'
 };
 
-var AuthFlags = {
+var AuthCtrl = {
     NONE: 'none',
 };
 
@@ -141,7 +140,7 @@ var Client = new Lang.Class({
     },
 
     enrollDevice(id, policy, callback) {
-       this._proxy.EnrollDeviceRemote(id, policy, AuthFlags.NONE,
+       this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE,
                                        (res, error) => {
            if (error) {
                Gio.DBusError.strip_remote_error(error);